Adwaita: flatten up search bars and inline toolbars

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 25c59e83c4281670230f31f0a9bb3a3e0a6432c1..2c8f41a61bb77e02e1793fa717e2bcf35aeda2f7 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1180,7 +1180,7 @@ toolbar {
 //searchbar, location-bar & inline-toolbar
 .inline-toolbar {
   @extend toolbar;
-  @extend %inset-bar;
+  @extend %darkbar;
   border-width: 0 1px 1px;
   padding: 3px;
   border-radius: 0  0 5px 5px;
@@ -1189,18 +1189,16 @@ toolbar {
 searchbar,
 .location-bar {
   @extend toolbar;
-  @extend %inset-bar;
+  @extend %darkbar;
   border-width: 0 0 1px;
   padding: 3px;
 }
 
-%inset-bar {
+%darkbar {
   border-style: solid;
   border-color: $borders_color;
   $_bg: mix($bg_color, $borders_color, 70%);
   background-color: $_bg;
-  box-shadow: inset 0 2px 3px -1px mix($borders_color, $_bg, 60%),
-              _widget_edge();
 
   &:backdrop {
     border-color: $backdrop_borders_color;

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 8b7417ba76dc339643cd134d5ce77242325b7cee..0df50d00cc07a6deb5449ebb4831f5f5e951733b 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1547,8 +1547,7 @@ searchbar,
 .location-bar {
   border-style: solid;
   border-color: #1c1f1f;
-  background-color: #303535;
-  box-shadow: inset 0 2px 3px -1px #242828, 0 1px rgba(238, 238, 236, 0); }
+  background-color: #303535; }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
     border-color: #1f2222;

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c8ff8f3fac243d226d5ad55d563541bfe8d2c650..ff7d32e417c9a2444ff12d0a24ce36cbc38d6d25 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1551,8 +1551,7 @@ searchbar,
 .location-bar {
   border-style: solid;
   border-color: #9d9d99;
-  background-color: #d2d2d0;
-  box-shadow: inset 0 2px 3px -1px #b2b2af, 0 1px rgba(255, 255, 255, 0); }
+  background-color: #d2d2d0; }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
     border-color: #a5a5a1;